bitkeeper revision 1.1389.5.46 (4280957c13dvEVUuixaYEHltnt6E1A)

Fix ACPI initialisation.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index f4967e9317d58072babd0bfb623d06c2f62e645b..ac659a52def20a3769f18bba802c4d3036cefe9b 100644 (file)
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -77,12 +77,7 @@ unsigned long wait_init_idle;
 
 struct exec_domain *idle_task[NR_CPUS] = { &idle0_exec_domain };
 
-#ifdef CONFIG_ACPI_INTERPRETER
-int acpi_disabled = 0;
-#else
-int acpi_disabled = 1;
-#endif
-EXPORT_SYMBOL(acpi_disabled);
+int acpi_disabled;
 
 int phys_proc_id[NR_CPUS];
 int logical_proc_id[NR_CPUS];
@@ -375,7 +370,10 @@ static void __init start_of_day(void)
 #endif
     paging_init();                /* not much here now, but sets up fixmap */
     if ( !opt_noacpi )
+    {
+        acpi_boot_table_init();
         acpi_boot_init();
+    }
 #ifdef CONFIG_SMP
     if ( smp_found_config ) 
         get_smp_config();